Add corruption recovery to history.db #6371
Merged
+58
−53
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
history.db currently lacks the automatic corruption recovery that cache.db has, causing BuildKit to fail on startup if history.db is corrupted. This is inconsistent since both databases are disposable (losing history is inconvenient but not fatal). This commit: - Extracts the safe database opening logic to util/db/boltutil/SafeOpen - Updates cache.db to use the shared SafeOpen function - Applies the same recovery mechanism to history.db The recovery mechanism backs up corrupted databases and creates fresh ones, allowing BuildKit to start successfully even after abrupt shutdowns or snapshot-related corruption (common with NoSync + network block devices like Ceph RBD). Fixes startup failures when history.db is corrupted, matching the resilience already present for cache.db since commit ccc06b7. Signed-off-by: Aditya Maru <[email protected]> Signed-off-by: Claude <[email protected]>
tonistiigi
reviewed
Nov 24, 2025
Member
tonistiigi
left a comment
tonistiigi
left a comment
There was a problem hiding this comment.
The reason we had this protection for cache db is that cache db uses NoSync. But History DB does not. Is the corruption reproducible in some way? Looks like it would be boltdb bug if it happens here.
Collaborator
|
@tonistiigi it's feasibly possible with things that cause external sync issues like the mentioned Ceph RBD. It's not something a vanilla version of buildkit run on a normal filesystem would likely encounter, but it likely doesn't cause any harm to include. |
jsternberg
approved these changes
Nov 25, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
history.db currently lacks the automatic corruption recovery that cache.db has, causing BuildKit to fail on startup if history.db is corrupted. This is inconsistent since both databases are disposable (losing history is inconvenient but not fatal).
This commit:
The recovery mechanism backs up corrupted databases and creates fresh ones, allowing BuildKit to start successfully even after abrupt shutdowns or snapshot-related corruption (common with NoSync + network block devices like Ceph RBD).
Fixes startup failures when history.db is corrupted, matching the resilience already present for cache.db since commit ccc06b7.